[SOLARIS] The hotplug scripts live in a different place on Solaris.

Merged with Xen API Tree

Signed-off-by: John Levon <john.levon@sun.com>

diff --git a/tools/python/xen/util/auxbin.py b/tools/python/xen/util/auxbin.py
index 50450773ddf14788187c64a49330d5a6842ee42c..5d2066157c07034f9ed0b19df1a51fd71358b174 100644 (file)
--- a/tools/python/xen/util/auxbin.py
+++ b/tools/python/xen/util/auxbin.py
@@ -21,7 +21,7 @@ LIB_64 = "/usr/lib64"
 LIB_BIN_SUFFIX = "xen/bin"
 
 ## The architectures on which the LIB_64 directory is used.  This
-# deliberately excludes ia64 and ppc64.
+# deliberately excludes ia64 and ppc64, and Solaris.
 LIB_64_ARCHS = [ 'x86_64', 's390x', 'sparc64']
 
 

diff --git a/tools/python/xen/xend/XendRoot.py b/tools/python/xen/xend/XendRoot.py
index 493a541fe682fea60e0d3648e4c2252f924aba01..927e5ed5373e564f4f66c55a760f35c3cda39847 100644 (file)
--- a/tools/python/xen/xend/XendRoot.py
+++ b/tools/python/xen/xend/XendRoot.py
@@ -30,7 +30,7 @@ import os.path
 import string
 import sys
 
-from xen.xend import sxp, XendLogging
+from xen.xend import sxp, osdep, XendLogging
 from xen.xend.XendError import XendError
 
 class XendRoot:
@@ -43,10 +43,10 @@ class XendRoot:
     config_var     = "XEND_CONFIG"
 
     """Where network control scripts live."""
-    network_script_dir = "/etc/xen/scripts"
+    network_script_dir = osdep.scripts_dir
 
     """Where block control scripts live."""
-    block_script_dir = "/etc/xen/scripts"
+    block_script_dir = osdep.scripts_dir
 
     """Default path to the log file. """
     logfile_default = "/var/log/xen/xend.log"